Merge "Send settings restored broadcast as the current user to support HSUM" into main