Merge "Fix hub also reacting to lockscreen shade/bouncer gestures" into main