Merge "Fix race condition in displayservice." into oc-dev am: 02e3c25f95
am: 167eefa720

Change-Id: I817744c1522aa031c6d34cdfa8a2af1445e87712