Merge "Fix hardware keyboard switch listener" into honeycomb