Merge "Fix NullpointException problem in onMenuItemSelected"