Merge "Split BitmapHandler into two classes."