Merge "Make the order of tabs same as profile creation" into main