Merge "Fix location of side-fps indicator" into tm-dev