Merge changes I3e28ba03,I5fc3849b into nyc-mr1-dev-plus-aosp

* changes:
  Merge \"Also report resize when frame changes without inset change.\" into nyc-mr1-dev am: 736a5af504
  Also report resize when frame changes without inset change. am: 31aa98bea8