Merge "Work toggle button staying at the top when moving keyboard down" into tm-qpr-dev