Merge "Avoiding cascading "nested events checking" failure after timed-out wait" into ub-launcher3-rvc-dev am: d60e33de3e

Change-Id: I4d79859a14bd2ff83141b89e1a2847533c9c4dac