Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev am: c36b2f0490 am: 3477c31485
am: 41f8f8611a

Change-Id: I8020d2d75c8246a269498ce792d98360bb18e57d