Merge "Add new string to replace 'swipe up to unlock'" into sc-dev