Merge "Move back to end of screen on keyguard" into sc-v2-dev