Merge "Catching generic app start exceptions in ProxyActivity" into sc-dev