Merge "Save display persistent data store" into sc-dev