LPS-40371 Fix initial notification
LPS-40371 Simplify master election logic