Merge "Don't update height if recycler view was scrolled" into rvc-qpr-dev