Merge "P2P App Sharing: Gray out disabled SystemShortcut"