Merge "Minor Refactoring only: no functional change" into ub-launcher3-master