Merge "Fix spinner not shows up" into tm-dev