Merge "Only disallow QS expansion while keyboard is visible" into tm-qpr-dev