Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev am: c36b2f0490 am: 57fe3036aa
am: 768c7a9cb6

Change-Id: Ie8bf7eaa83b2396ecce98075ca800e116110bd29