Merge "Update peristent repository on visiblity change" into main