CBD=924:  fix up scrolling control

Change-Id: I446c3c39fc0695d250430a0714d405a545811bc1