Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev