Merge "RESTRICT AUTOMERGE Revert "Support CMF default wallpaper"" into udc-dev