Merge "Address issues surrounding freezing by display." into oc-dev