Merge "Default 'showWhen' to true" into main