Merge "Fix background animator not resetting"