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