Merge "fix menu state after fullscreen video" into honeycomb