Merge "BroadcastReceiver in UserBackupManagerService can crash system_server" into qt-dev