Merge changes I35fe528b,Ia612c1b5 into udc-dev

* changes:
  Don't close AFVs when opening Taskbar folder.
  Keep persistent Taskbar visible over Taskbar All Apps.