Merge "Increase expand/collapse tap target" into rvc-qpr-dev