Merge "Reset the home settings activity when launching it" into tm-dev