Merge "Minimize exposure of NotificationHeaderView; prefer NotificationViewWrapper."