Merge "Don't ensure config for activity that is about to be invisible" into oc-dev