Set up view state before attaching, jump drawables if needed
am: c328f042a6

Change-Id: Ie3df4a2e889577a7a64adc1fff4d773529da0d61