Merge "Rename back button to navigate up button" into tm-dev