Merge "Work profile badge alignment b/21336417" into ub-launcher3-burnaby