Merge "Fix Stay on 'SELECT INPUT METHOD' page after choosing input method" into sc-dev