Merge "Add a reason to the broadcast to collapse system dialogs" into tm-dev