Merge "Deprecate ListActivity and ExpandableListActivity"