Merge "Apply correct restoring logic." into arc-apps