CANA-1302 #time 1h Working on the persistent controls layout