Merge "Add Gainmap bitmap & imagedecoder"