Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo