Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am: 22e006214c
am: 26849eca9c

Change-Id: Ie35d0812808f9ffae24657ad54f4780f9a237f2f