Merge "VCN: Remove hidden APIs for data directory and Settings constants" into main