Merge "Unify the source of truth for NORMAL <> ALL_APPS transitions." into tm-qpr-dev