Regroup CRT and Listview animation in the same header

Change-Id: I773be167487eb3823aec8e7a0b7ecc37c4ec8ebc