Merge pull request #339 from ThePlayground/master

Let the interface freeze so at least the ANR is not silenced