Merge "Disabling button when not visible" into main