Merge "Separate enable/disable and show/hide logic in ButtonManager" into ub-camera-haleakala