Merge "Move hide scm button condition" into main