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