Merge "Only adjust the task position when there is no move-to-top request." into rvc-dev