Merge "Move shortcut processing logic into separate components." into tm-qpr-dev