Bug 1064002 - Android config changes