Merge "Update ANR latency tracker for short-FGS"