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

Change-Id: I4d52f422475f373a2e116f56e37eb9d76a9c53b0