Merge "Fix 32&24 ->16 bit bitmap uploads."