merge back changes on ModeSelectionActivity