Merge "Wait a bit longer to take screenshot" into rvc-dev am: 007b5f7e71

Change-Id: I2e3353246b824d3077aaaf9a55e9e61e1195b5e0