Merge "Add system exemption for dismissible notifications"