Merge "Remove scroll-up effect from lockscreen swipe-up and unlock hint"