Merge "Set up view state before attaching, jump drawables if needed" into...
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am: 22e00621 am: c562501e
am: 498860a6
Change-Id: I9c7912b60f3b7ffde5a321b5913d0ffabf1a3054