Merge "Avoid multiple calls to start/stop FGS for the same session record" into main