Merge "Wait a bit longer to take screenshot" into rvc-dev am: 007b5f7e am:...
Merge "Wait a bit longer to take screenshot" into rvc-dev am: 007b5f7e am: e0b83cb6 am: 72aac4cf am: 702a2d5d am: 551c1b71
Change-Id: Iba886fcc0b030a1c3bb1ed84e3d120a1034cc1fd