Merge "Fixed that group children expand buttons were sometimes colored"