Merge "Multiply alpha for AA as late as possible" into jb-mr1-dev