Merge "Wait for events to drain before checking thumbs." into rvc-dev am: 25aacaf272 am: 89830765c2 am: 031b2d5711 am: a8892d953d

Change-Id: Ibf3802ec97202b374d8fa833b882ddb8b2c20cf0