am 706f50c3: Merge "Back up the preferred home app, if any"

* commit '706f50c3abe0d899304313fd8631c35098d9866d':
  Back up the preferred home app, if any