Merge "Update of accessibility settings"