Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb