am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev

* commit '105febd2cfb4760926ed0aef3c24be3727dd36e4':
  Don't re-wrap alert dialog context