Merge "Core accessibility settings should not be cleared on restore." into jb-mr1-dev