Merge "Fix hub touch interactions with bouncer and shade" into main