Merge "Eliminate mHasAlpha" into klp-dev