Merge "Small improvement for ag/17016891 (unstash taskbar input area size)" into tm-dev