Merge "Update the flag in system UI rather than reposting the notif" into qt-dev