Merge "DO NOT MERGE Add support for background scanning" into honeycomb