Merge "Make legacy storage appop unsticky on upgrade to R"