Issue #20715: Fixed Save issue, added save button disability functionality, added spinner.