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

Change-Id: I3600326ebccb7c08cbcdf7db7b10ab096b8d3a5b