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

Change-Id: I624e5f11d3352df6f5bce0dcc0b5e7f38dadb8b2