Merge "Add a log statement to help with debugging flicker test issue."