Merge "Clean up updating bounds after config/display info change" into nyc-dev
am: a572863

* commit 'a57286307b3a5a81f78b47d2a0ac6ae2458f66f9':
  Clean up updating bounds after config/display info change

Change-Id: I95f756eedd4b59e7a2c630f98493dedfd36842cf