Merge commit '750e82e51921428dc4ad9a75f18b02b8048734d8' into eclair-mr2-plus-aosp * commit '750e82e51921428dc4ad9a75f18b02b8048734d8': When tasks are moved to top or bottom, the app tokens are being rearranged.