Merge "Controls UI service cleanup"