Merge "Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605 am: 3bfe967e5c" into nyc-mr1-dev-plus-aosp
am: 80c8bbd004
* commit '80c8bbd00449e1d26874c8b6b3f644b648e3e550':
Change-Id: Id97548fd6e31066a4326486f754cf9b01e5ec463
This commit is contained in: