Merge "Properly hide footer buttons when label visible" into main