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

Change-Id: Ib02fa528696015ceb80e574106f2caadc16d5846