Merge "Lockscreen E2E test improvements" into main