Merge "Make bouncer background opaque" into 24D1-dev