Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev