Merge "Never instatiate App class multiple times" into tm-dev