Merge "Revert "Avoid a potential race condition on mDisplays"" into oc-dev