Merge "Remove jank tracker from back panel" into main