Merge "Check for null mLeash before setting alpha." into tm-dev