Merge "Default keyguard scrim should be 45% transparent" into pi-dev