Merge "Fix 3366514 (again): browser emulator crash" into honeycomb