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

Change-Id: If0b75ee69bdb7c1668e87d40cb0c1d7d72feff58