Merge "Make ActionBar fail more cleanly when invalid heights are set" into jb-mr1-dev