Merge "Update swipe up from the locked shade behavior" into sc-v2-dev