Merge "Separate callbacks for dismiss start and end" into tm-dev