Merge "Don't log file contents when loading dynamic layouts" into feature/zuulv3