Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev