Merge "Don't load dynamic layout twice unless needed" into feature/zuulv3