Merge "Use explicit height for attachment progressbar" into honeycomb