Merge "Fix the freeform task bounds changed after device reboot" into main