Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop