Merge "Fix the mockwifi test on secondary user" into main