am 885adf34: (-s ours) DO NOT MERGE. Fix crash in STK app when launching browser

* commit '885adf34b162728a8c9c04fc16abb6b5fba04395':
  DO NOT MERGE. Fix crash in STK app when launching browser