Merge "[ScreenLock] Fix result code handling"