am b8336373: am 3eaaf7d1: am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit

* commit 'b8336373ffe1c39532e4645cbcc938c7676f3943':