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

Change-Id: If9ec8e8492ed8249cc99dfe05e97a0cf62ff8dd8