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

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