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

* commit 'e4dd48939ddeda2197b722c06f9ec803d8249f0d':
  Fix NullPointerException issue when user change