Merge "Back up / restore preferred app configuration"