Merge "Don't override alpha for invisible elements when squishing" into main