Merge "Split app move into separate copy/delete steps." into mnc-dev