Merge "Cleanup hsum_unlock_notification_fix" into main