Merge "[incremental] fix metrics logging during ANR" into sc-dev