Merge "[DO NOT MERGE] Remove selection toolbar code from build time" into tm-dev