Merge changes I59ff27da,Icf74770b

* changes:
  [sysui] Use weak reference for the listener in NavigationBarTransitions
  Ensure no duplicates in ThemeKey