Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev