Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev