Merge "Introduce overflow menu button"