Merge "Handle BACK shortcuts in PWM by injection" into main