Merge changes If61a2c1f,I06679897

* changes:
  Fixing header bar icons.
  Show the correct pointer when dragging task in Recents.