Merge "Pass active functor rendering threads to HWUI ADPF session" into main