Merge "Fixed issue with turn-screen-on activities" into oc-dev
am: 26ba9f8833

Change-Id: I0194fb251723808346fb7684835a7c60081ae2ae