Fix bug: Cannot apply changes after switching panels back and forth

Bug: 57011
Change-Id: I0614d97dea99781f46bb80a496b12c95aef55c8c
Merge "Fix bug: Cannot apply changes after switching panels back and forth"