Merge "Add traces to the main thread inflation of NotificationHeaderView and HybridNotificationView" into udc-dev