Split test theme into separate themes and added theme selector

Change-Id: I076a05a393ae85bb68983eaa2756d36a0e92014e