Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev