Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev