Merge "Fixing issue where shortcuts to standard android intents were getting pruned." into jb-ub-gel-agar