Merge "Take AudioFocusStack state into account when showing/dismissing notification" into main