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

Change-Id: Id506c454592c4e14a4fb5b294acf9deee36aa04b