Merge "Fix 3385181: Widget doesn't stay where I put it" into honeycomb