Merge "(cherrypick from master) 3322879 Device soft reboots on enabling and disabling accessibility settings" into honeycomb