Merge "Do not animate doze amount when fp"