Merge "Simplify scrimmed bouncer condition"