Wait on correct handler in tests

Since the CS focus manager was moved onto its own thread, wait on that
thread's handler in the tests instead.

Test: unit
Change-Id: Ib2ca729dcead386f2238fe2a16dcba75d71e3f76
2 files changed