Merge "Remove lock delay on exiting edit mode activity" into main