Merge "Remove usages of the DISPLAY_JANK_REPORTED atom" into sc-dev