Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145
am: c717e603b1

Change-Id: I584661bb20175ef11e761ce87c629de9f7b29dc6