Removing some dependency on Launcher UI

Change-Id: Ic1c84880cfe4daa9398b8eb27c3afc0837c5a8ca
4 files changed