Merge "Fixing item check when user is enabled/disabled" into ub-launcher3-master