Merge "Fix some ActionBar menu issues around config changes" into jb-mr1-dev