Merge "Fix tests to explicitly turn on/off ADPF GPU flag" into main