am 110ddbfe: Merge "Fix NullPointerException issue when user change"

* commit '110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb':
  Fix NullPointerException issue when user change