Merge "replaced deprecated setButton methods"