Merge "Keyboard quick switch polish" into tm-qpr-dev