Merge "Extend/shrink work button when scrolling" into tm-qpr-dev