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

Change-Id: I92227499e8d1c81e074e778359e3e003643a6d67