Merge "Decouple SD card from ADVANCED storage toggle."