Move group/project removal behind additional flag when mapping accounts to GMA

This is related to #13481 (closed) and !24329 (merged)