Merge "Do not enable storage app data isolation on special mount options app" into rvc-dev