Merge "replaced deprecated setButton Methods"