Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev