Merge "Fix for FAB targets not matching current user on user switch" into main