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

Change-Id: I7e7e824df9ffee5f56bb6159ad5c2e7ca6dc7a88