Merge "Passing code path when moving apps across storages"