Merge "Fixing shortcuts not getting theme icons" into tm-qpr-dev