Merge "AdapterProperties: Always set the scan mode on enable/disable"