Merge "Add sysuiResTag to compose bouncer elements to fix e2e tests" into main