Merge "Deprecate some active_unlock_unlock_intent triggers" into main