Merge "Move skip mount config to system_ext"