Merge "Add more sysuiResTag to fix e2e tests with the compose bouncer" into main