am 5a2479d5: am 6c060cef: Merge "STK UI error when configuration changes"

* commit '5a2479d5c0bec87be352394c147282e5e4fc7ad4':
  STK UI error when configuration changes