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

Change-Id: If2fc7a180a11315c157cae9313e6c909fb17b3ba