Merge "Making sure QS are visible when expanding shade with heads-up notification" into tm-qpr-dev