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

Change-Id: Iab17490d10eb0300e3d17de94d7df3148b8209d5