Merge "Remove selection toolbar code from build time" into udc-qpr-dev