Merge "Pass button index into inflateButton" into nyc-dev