Merge "Removes instant apps from certain screens" into oc-dev