Merge "Fixing wrong alpha for disbled icon" into tm-dev