Merge "Initial changes for handling configuration changes dynamically" into ub-launcher3-master