Merge "Allow shortcuts to be pinned by unbundled chooser" into tm-qpr-dev