Merge "Load application icon and label for UID battery consumer type" into sc-dev