Merge "[Split shade] Fix QS actions footer border visible on shade expansion" into tm-qpr-dev