Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev