Merge "Force uniform width for MATCH_PARENT in AlertDialogLayout" into nyc-dev