Merge "Fix A11y volume persisting/restore" into oc-dev