Merge "Support grayscale bitmap" into mnc-dev