Important fixes for invisible choice mode controls on pre-Lollipop.