Merge "Fix ProfileSelectLocationFragmentTest" into main