am 1c4547bd: Merge "Polishing the AllApps transition" into ub-now-porkchop

* commit '1c4547bd5f92b24e6a02fcb6f77eb1a166da3795':
  Polishing the AllApps transition