Merge "hide launcher restore behind a flag." into jb-ub-now-kermit