Merge "PowerManagerService: only turn off screen when we really mean to"