Merge "Do not add arrow to OptionsPopupView." into sc-dev