Merge "Use current alpha on PRIMARY_BOUNCER->LOCKSCREEN" into main