Merge "Fix NPE encountered after setting LSKF for remote lockscreen validation" into main