Merge "Add psap_ai flag to protect DeviceConfig flags" into main