Merge commit 'fe9b503e57e3efc1909121db65dd470d908cc938' * commit 'fe9b503e57e3efc1909121db65dd470d908cc938': Allows users to scroll while in select mode.