Merge "Handle group tear down only at group removed event" into jb-mr1-dev