Merge "Remove ZoomButtonsController view immediately when !visible"