Merge "Failing all e2e tests after seeing a lock screen without additional checks for the lock screen" into udc-dev