Merge "Filter instant apps with different names" into oc-dev