Merge "Ensure that hardware Bitmap has a ColorSpace" into qt-dev