Merge "Home Controls: Update colors after setting icon" into tm-dev