Merge "Fix NPEs when swiping up from keyguard" into sc-v2-dev