Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev