Merge "Set up view state before attaching, jump drawables if needed" into nyc-mr1-dev