Merge "Fix issue #6444627: New status bar/action bar interaction a bit disjoint" into jb-dev