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

Change-Id: Ic153d5df90cd74ba7b0fc8b1a3c3e7af06e7f7f9