Manipulation: Check state lost if the name is set for Android 4.0-4.3

Refs gh-1820
Done (in both PRs).