Merge "Add rotary encoder support to scrolling containers" into cw-f-dev