Fix bug where the paint's color and alpha were overriding each other. Change-Id: I47f41c3bc20243cef209c2c299642c024cf35652