Merge "Fix 3148496: Update LockScreen assets & layouts"