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

Change-Id: Icee9f177557338f2392434701bb80e4300287661