AUS-2559: Turn visibility on and off