Merge "Manage heads up state during notification update." into lmp-preview-dev