Merge "Don't remove content URI shortcuts during restore" into ub-now-porkchop