Merge "Add app compat flag to enable/disable scoped storage"