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