issue:449267 wait for eqh to exit runEventLoop before inserting it back to cache

Change-Id: I69302989384d1dd8c5d624703d185ca83a31b106