Set up view state before attaching, jump drawables if needed am: c328f042a6  -s ours am: 54e7cbe563
am: 257d8ea408

Change-Id: I79bd3d710dab173bf1d892b8ec970ac05f130354