Merge "Introducing new variable to enable/disable shortcuts." into tm-qpr-dev