Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb
am: ede05733f0

* commit 'ede05733f0c02f16324b71311397db5e680f607b':
  Workaround for ignored resizeableActivity param

Change-Id: I81ee6a65b44b9f8f099842619d3548fb64c4c403