Merge "Use the new onAdapterAttached API" into master-nova