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

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

Change-Id: I7fdcae1e4915866179b0686d2d3602b89460b4d2