Merge changes from topic "header-height" into q

* changes:
  TypeClock: Properly calculate the height
  LTE+ indicator not shown when attached to CA network
  SystemUI: Make header image height offset user configurable [1/2]