Remove Update Setting from shield and move it to advanced settings.
Merge branch 'release/12.0' into develop

* release/12.0:
  Remove Update Setting from shield and move it to advanced settings.