Merge "Allow users to switch from web to app" into main