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

* commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
  Cleanup of the code in view to do creation/destruction in the right places.