Merge "Clean up extra app info." into tm-dev