Merge "Fixes installed launch intent rewrite"