Merge changes Idb555b01,If8acf31b into nyc-dev
am: 831ecc8

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

Change-Id: I30248e5462149359c9200aef069245b9950e639a