Merge "[LockSetup] Add padding to lock setup screens"