Merge "Update scrims when keyguard gets occluded" into pi-dev