Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb