Merge "Update e2e test selectors for lock screen user switcher" into main