Ensure lock is activated when editing subscriptions
Ensure lock is activated when editing subscriptions

(cherry picked from commit e413147b507e094091b3616a06c06084e3dbf82e)

CombineCommunity/CombineExt,CombineCommunity/CombineExt,CombineCommunity/CombineExt