Merge "Attach work badge to Weather and Battery widgets" into tm-dev