Merge "Various managed profile fixes" into ub-launcher3-burnaby