Merge "Update PowerNotificationWarnings"