Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512

Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js