Merge "Move FloatingTaskInit set up into init method"