Merge "Removing some classes/fields not used by either SysUI or Launcher" into udc-qpr-dev