Merge "Make SystemUI always consists with the contrller overlay." into jb-dev