Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-dev