Merge "Additional polish for the NORMAL<->ALL_APPS transitions." into tm-dev