Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev