Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev