CANA-1302 #time 30m Removed the default persistent controls.