Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev