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

Change-Id: I601ad9df09c5dd3682cac7e81116ebc77c5d2ddf