Merge changes Ie427a2d8,I213f1f76 into nyc-dev

* changes:
  SysUI Tuner: UI cleanup and grouping
  SysUI Tuner: Night mode v3