Merge "Add 2 compat flags to strictly enable/disable scoped storage" into rvc-dev