Merge "Use ComponentCallbacks instead of ConfigurationChangeListener" into udc-dev