Merge "Fixed a bug where we weren't releasing views" into oc-mr1-dev
am: a782ff3fb7

Change-Id: I03f6527ae3ebd36b6df26a8d3a786157ce8a1d90