Merge "Remove overscroll on keyguard when swiping up then down" into main