Merge "Fix conversation group spacing; keep stack to 120dp"