Merge "User switching on boot race condition - unit tests" into main