Merge "Don't set override display info for ActivityView" into pi-dev