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

Change-Id: I39f613ee14166b77c50f749b7375d1b3e2849239