Cherry pick commit

Conflicts:
	src/com/androidsnippets/wordpress/swipetodelete/MainActivity.java