Handle file renames in diff view

Change-Id: I809a0bddc2ca45f9b5789abeb770cf55d068f87d
Merge "Handle file renames in diff view"