roll back namespace changes and fix disappearing launcher issues

Change-Id: I9f45325168c3bea2a129d682665bde605fcd11ac