Merge "Single Actionbar: no more split" into jb-ub-mail-ur9