Merge "Correctly apply alpha on TextView. Bug #2969691"