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

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

Change-Id: Iaa963ff9bd03efc57024d590dca4f9deba75f498