Merge changes I339886d1,Id53bfc8c into udc-dev

* changes:
  Fix themes of the bubble manage button
  Revert "Use ComponentCallbacks instead of ConfigurationChangeListener"