Merge "Removing some unused code from All-Apps" into tm-dev