Merge "Fixing focus issues in Launcher (keyboard support)."