Merge "Reconfigure display info. after configuration changes." into nyc-dev
am: 10f4f44

* commit '10f4f44efe0eeb47ea63471c221d7a765f55e3ae':
  Reconfigure display info. after configuration changes.

Change-Id: Ie301b0c3cdd5b40c6e9f559b30770fe046145f43