Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb