Merge "Send size-compat scale to the client" into tm-qpr-dev