* commit 'a5b28b92b14d0949d43be6198fedc31872ad07f6': DO NOT MERGE Backport of limited jank-tracking metrics