Merge "Polishing the AllApps transition" into ub-now-porkchop