slimlauncher fetch merge

Change-Id: I68dc3455f273a27c47d93aced1bdef3b76eb0459