Merge "Use bitmap width for bubble icon and app badge to calculate translation" into tm-dev