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

Change-Id: I06de8e949e19c6cde0295c755bb1f69f79964f0c