am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master

* commit '9d9aac4cacce75b4847aebce0f019250dc3b4e93':
  Doesn't re-sort app windows when move task to top