Merge "Use Activity Context for CDM ListView Adapter" into sc-dev