Merge "Add Class for flag notification_async_hybrid_view_inflation" into main