Merge "Support cleaner rotary scroll declaration" into rvc-qpr-dev