Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev