Merge change 9267

* changes:
  Don't invalidate view if setEnabled doesn't change the state.