Merge "Misc tweaks to create shortcut handler"