Merge "Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476" into jb-mr1-dev