Merge "Split out jank data from policy"