Merge "Fixed issue with turn-screen-on activities" into oc-dev