Merge "Fix 5021968: Add input method switcher button to lock screen."