Merge "Let accessibility feature instructions scroll." into cm-10.1

Change-Id: I55d823fef1a9b1c57e08f42cf143a3b5fd70b2e9