Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds" into tm-qpr-dev