Merge "actionbar and tabs image updates" into jb-dev