Merge "Inline noti blocking is now in the form of a question"