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

Change-Id: I12fa7cabdc29dcc707756c8e849682b93ceee199