Merge "Moving skip_mount.cfg to system_ext partition"