Merge "Don't mangle layer paint's alpha" into lmp-dev