Merge "Replaced deprecated calls to setButton and setButton2"