Merge "Allow developer to override Material-style modes in picker dialogs" into nyc-mr1-dev