Merge "App Shortcut menu bug fixes and polish." into sc-dev