Merge "Fix FGS enter/exit statslog semantics" into sc-dev