Merge "Controls UI polish"