Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into tm-dev