Merge "don't log non-instant app resolutions" into oc-dev