Merge "Avoid a potential race condition on mDisplays" into oc-dev am: 063c5dc547
am: fe7ec4d0fb

Change-Id: I62c7283209caa06a55a3db601aa6c105910aae4c