Merge "Log reset notification content view alphas" into main