Merge "Fix transition from Internet Tile to Share Wifi" into 24D1-dev