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

Change-Id: Ib19c9f7c09574796d8446f2195323d78aa6b8811