Merge "Fix NPE from LockScreenSession#unlockDevice" into rvc-dev