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

Change-Id: Ie3db2e84ebf21b54645829083c5b88dd2edf8c7d