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

Change-Id: Ic838b6527d4b8e2b6bd16879d10c1ca1a2a000c8