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