Merge "Merge "Only disallow QS expansion while keyboard is visible" into tm-qpr-dev am: 49a00c31 am: fe1f1421" into udc-dev