Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev