Merge "Don't re-wrap alert dialog context" into mnc-dev