am 377329db: Reconcile with jb-release

* commit '377329db75cc550ed78418c0c6a04a5ac534e5ba':
  Make SystemUI always consists with the contrller overlay.