Merge "Config to enable/disable AOD via overlay" into pi-dev