Enable auto-release after close

Change-Id: I4459e010194aa87c7f13ae220445916238db5da3