Merge "Add auto-restore setting and Backup Manager awareness thereof"