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: 26849eca am: 20c29b0c
am: 1861b0b4
Change-Id: I98065d1a6a2b92c60d50a671932d4e429f295a46