Merge changes Idb555b01,If8acf31b into nyc-dev

* changes:
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front