Merge "DO NOT MERGE Fix account list for group editing" into ics-factoryrom