Merge "SelectableTargetInfo "immutability"/other cleanup" into tm-qpr-dev