Settings: Separate animation settings

Change-Id: I3ecba5363226ffc8568a85acf8c48a81bc5d97f5