am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev

* commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5':
  Make SystemUI always consists with the contrller overlay.