Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev