Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev am: 211078e1c3
am: 56ffb646c7

Change-Id: I33b5621e6a4bb5685448f6c64cbcd32be9c32f3f