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

Change-Id: I0adda914014cf274242e5c195803ec9be04b9cf9