AI-741 : if user decided to switch to new layout, persist the decision and only then switch to new layout