Merge "Pad ime_switcher same as navbar buttons"