Merge "RESTRICT AUTOMERGE Center align the lock screen wallpaper" into udc-dev