Merge "Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d111 am: c717e603" into oc-dr1-dev-plus-aosp