Merge "Don't intercept touches when the qs scrollview can't scroll" into rvc-dev