Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb