Merge "Fix issue #3400255 Dialog fragments crash on rotation in Settings app" into honeycomb