Merge "Revert "Avoid a potential race condition on mDisplays"" into oc-dev am: c90e469393
am: 5599839f77

Change-Id: Iabf61759bda0fc023a925e40ebf1a4b20f996465