Merge "Update LockScreen layouts to latest UX spec."