Merge "Adding support for customizing shortcut pinning logic" into tm-qpr-dev