Merge "Fix bug 3176330 - Improve documentation around MenuItem.setShowAsAction"