Merge "Be sure to update the display metrics on config change." into klp-dev