Merge "Add support for ADPF hint session tid cleanup" into main