am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"

* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
  Fix NullpointException problem in onMenuItemSelected