Merge "Skip calling adpf session if it's null" into main