am a080e480: Merge "Fix bug #13563247 Settings crash on launch in secondary user"

* commit 'a080e4804932b725fcebdbdee05d877328316feb':
  Fix bug #13563247 Settings crash on launch in secondary user