Merge "Encapsulate background width updates to ActivatableNotificationView" into tm-dev