Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev