am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active...
am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit 'c1aaf4b5':
Prevent lock screen appearing during active slideshow