Merge "Refactor special app tracking." into main