Merge "Refines the hardware shortcut landing dialog behavior"