Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev