Merge "Kepp PreviewDataProvider instace over a configuration change" into udc-dev