am 2920bf91: Merge "Set STK header if icon is null and selfexplanatory"

* commit '2920bf91e2ecd2304cf658445870160137390e64':
  Set STK header if icon is null and selfexplanatory