Merge "Reject transparent draws more conservatively" into lmp-dev