Merge "Don't set override display info for ActivityView" into pi-dev am: 982973934d
am: 8ef2b626c8

Change-Id: I1cd3d6bf253b77316f8194292f619928c9e95530