Merge "Revert "Revert "Icon: make Icon's Bitmaps immutable""" into tm-dev