Merge "Fixing wrong views being made visible when opening all apps" into ub-now-porkchop