Merge "Home Controls: Add settings dialog" into tm-dev