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

* commit '3b17fe8d831bf176f6075a67e5fbf6d0a10e5b73':
  Set STK header if icon is null and selfexplanatory