Merge "Only set appToken.setCanTurnScreenOn to false if screen was turned on."...
Merge "Only set appToken.setCanTurnScreenOn to false if screen was turned on." into pi-dev am: fb6531d3
am: 928f3f28
Change-Id: I4182fae4057b8464735f9d56e39a93386bf5926a