Fix NPE on tablet carousel animation

sorry my bad

Patchset 2:
- cleanup

Change-Id: I3f5c9a408b2f16896f9e2ebebf88f8c1b94f1d21