Merge "Fix missing UI_MODE_SERVICE rename."