update lock status in app
update
to standard
Merge remote-tracking branch 'origin/feature-conversation-controls' into feature-conversation-controls