Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev