am bc1efa92: am 3b4e1c0a: am 26b49a7d: Merge "Be sure to update the display metrics on config change." into klp-dev

* commit 'bc1efa92c455ff3b48b5e14cc6eda7f9f76058f6':
  Be sure to update the display metrics on config change.