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

Change-Id: I8165af88d024cbf7059bf47def81f3b444993bdb