Merge "Don't crash Launcher on config change." into honeycomb