Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev