Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1