Merge "Don't force ended when full screen video is returned manually." into gingerbread