Merge "Removing static instances of UserManagerCompat and AppWidgetManager" into ub-launcher3-master