Make it possible for View and Edit to be in a Dialog

Change-Id: I55e0f3d9369e638651034131812a590984ff2282
10 files changed