Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: 6b21f45add
am: e78cbe1770

* commit 'e78cbe1770ffee7d9f24c8f1126fb1592c9ad1c3':
  Workaround for ignored resizeableActivity param

Change-Id: I36d934ec2aea69156680d9b9e55584ce12d76b60