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

Change-Id: I98065d1a6a2b92c60d50a671932d4e429f295a46