Merge "Extract shortcuts loading logic from ChooserActivity" into tm-qpr-dev