Merge "Remove unused SystemUi service"