Merge "Fix AndroidRuntimeException when rotating Honeycomb device" into klp-ub-dev