(cherry picked from commit 71e7836001)
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
(cherry picked from commit 71e7836001)
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js