Merge "Turn on multi-user support for PreferredActivityBackupHelper"