Merge "Cache mEphemeralAppsDisabled state" into oc-dev