Merge "Show the right icon and label for work profile in data usage." into nyc-dev