Merge "Do not darken scrims when unlocking with fp" into pi-dev