Merge "Extract cell horizontal space to a method" into tm-qpr-dev