Merge "Change Myphoto thumbnail" into tm-dev