Merge "Bug 5078738: some options moved to overflow menu"