Merge "Implement checks before performing background attachment download" into honeycomb