Merge "Partial revert of the filtering added for the Jank API." into main