Merge "Bakup and restore communal shared preferences" into main