Issue 5619: Gingerbread options menu fix