Merge "Hide layers that have irreversible transforms" into tm-dev