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

Change-Id: Ief507623b7414db746109bc621fdae6b9f298140