Merge "Update lockscreen detection" into main