Merge "Fix group source crash on phone"