Merge "Refresh state when updating seekbar visibility" into main