Merge "Fix AlertDialog width on API 11+" into nyc-mr1-dev