Merge "A few little tweaks to system ui flag demos." into jb-dev